YAML Fix 3