FIXED: Issue #1 - Better detection of form submission