work on fixing oh oh! bug