Fixed compatibility with Ivania