Fix regression which caused .npa corruption