Fixed CNPU on mx1/mx2 devices