fix up for latest versions 0.9.1-rc2