Added fix to allow working correctly with form validation