Further fixed canSubmit logic