Fixed _overrides and _variables