Fix after fix