Fix conditional fields for HC's latest change