Fixed compatibility issue with the last update