Finally fix the fix (what a day)