Fixing a fix of a fix