Minor changes
Bug fix