Bugs fixed
Bug fixed