Initial version of the fix.