Fixed compatibility issues with 1.8.7