Actually implement the fix