Fixed compatibility