fixing the fixes