metomi/rose#269: improve
metomi/rose#269: fix