Finish the fix