Fixed compatibility issue