correcting the fixes