There are some more places where this problem occurs so have re-opened the bug and added an new patch to fix the problems
There are some more places where this problem occurs so have re-opened the bug and added an new patch to fix the problems