npi fixes