Fixed an issue with hidden fields