annoying bug fix