Fixed compatibility bug