Fixed compatibility problem