Fixed annoying bug