cleaning up the fix