cleanup for the fix