Finally fixed this thing