Fixed handling of invisible fields