Fixing the fix :-(