Fix SubmitHelper