Initial repair

Initial repair