Stefan, Rudolf, can you try the attached patch and see if it fixes the 
issue?

Thanks.