Yaml engine fix