Just tested the attached patch from comment #7 and can confirm (as far as i can test) that this fixes the reported problem.
Just tested the attached patch from comment #7 and can confirm (as far as i can test) that this fixes the reported problem.