fixed potentially very annoying bug