Fixed multiple NPEs