annoying bug fixed