Fix NP forming