Attached is a new patch which addresses this problem.
-- Chris Bitmeadmailto:chris(at)bitmead(dot)com