Fixed compatibility issue with 5.12