Finally fixed this