Fix NM conversion