Fixed an annoing bug
Commiting latest changes