Fix the fixes

[permalink]