fixing the fixes, which didn't actually work