Another attempt at solving the yaml problem