metomi/rose#225: fixes