Annoying bug fixed