This is the second problem we found and logged yesterday in Jira issue
350. I guess not to difficult to fix with reference to the changes done
in r5313, but personally I've got a few other things to deal with so
can't really dig into it at the moment, although it is a killer for POS.