FIX for resubmit and adhoc