Bug fixed
Small changes