Fix NFMap bug