metomi/rose#508: bug fixes
metomi/rose#508: tweak