2nd try at repair