Bug fixed 51