fixing major annoying bug