Second commit. Bug fixed