Fixed compatibility to 1.9.2+