fix NHC after checking on a real system