Fix the fixes

[permalink] [random]