Fix zarah submission to NAF