Code updated

Bug fixed