Finally fixed this crap!