New NINJA fix attempt