make command more yaml proof