Make sure to remove the original submit handler.