fixes to the fix