fixed sluggish yaml handling