fixed prepare to submit match issue