Fixed nt mapping