Actually finish the fix