Fix for resubmit on v5