fix yaml support