New commit
Bug fixed