npe fix 2