fixing most annoying bug ever.