Fix Nxx lookup