Please look at the diff below. I won't have much time till Tuesday. Will read how to try to use early patching then. Thanks. I've also send bug report to the