Fix the new NRE