ahhh... finally fixed this annoying bug