fixing issue #221 : Submission is broken when user has draft.