Fix nsb function mapping