Fix naa distribution