@rpkamp I suspect this to be a regression from #644. Can you have a look, please? 