Got rid of some bugginess