Thanks for the patch as provided above. We will take a look at this issue and try to resolve this in SVN.