Repair bug and Done