fixed issue with hidden fields