Fixed an annoying bug