Repairing tip bugs