fixed the most annoying bug ever