Bug fixed 3