Thanks for the patch but I think it is better to fix this in yat2m. I created a new tag for bugs related to it.