Ignore my patch and comments.  After thinking about this more they won't work. 
See is Michel's patch fixes it for your.