refixing the fix of the fix (can I go home now?)