NPE fix for simulations