Fix for YAML compatibility