npe fixed