Repair batlle #16