fix to make work with 0.9.1-rc2