Attached is a patch to fix this bug.