Fixed the most annoying bug(s) ever!