Hello, I'm sending this patch once more after more then 3 months, seems like the previous one was overlooked. Would appreciate any feedback so I can make necessary changes to get this merged. I think the bug is very unpleasant surprise and would be nice to have it fixed. Have a nice day, W.