Fixed a really annoying bug