Repair bug #2