bug fixed for naf submission