Fix submission template issue