Added form validation workaround