Fix issue with hidden fields