New NINJA system fix attempt