Bugfix for submit scenario.

Unreviewed.