Bug fixes
Bug fixed