Fix bugginess.