fix bugginess