Fix of fixes