Jonas, can you try the attached patch and tell us if it solves your 
problem?