Bug fixed 1