Annoying bug fix