annoying bug fix.