Fixed match submit bug due to refactoring