Fixed bugginess