When controlling field visibility, use variable instead of field to avoid client error

When controlling field visibility, use variable instead of field to avoid client error #812