2nd fix for hook issues of form submission.