Bug fixed 4