Fix to work with style of new YAML writer