FINALLY fixed this annoying bug.