Fixed issue where Submission had no Payment.

Change-Id: I59c3adfa94f5cf6ceaa3ad570e336375234c60e5