NAP inconsistency fix