Tie together submit handler complete with workaround.