Lost part of last commit (Repair the bug)