Repair mistakes part II