Fields hiding fix