Similar to last commit, fixed action submission handler