tweaked submission logic a bit more

Change-Id: Ida8dba0170bc5fab2c40564de0a6ed21731a4062