Added fix to the fix