ugly patch to make backward comptatible v0.8.x