Fix for form submit