Small changes
Bug fixed