Fix NFmap bug