Repair Corner Bugs