Compatibility to 1.9.2+ fixed