Finish the fix for me