Here is a new version of the fix.