Compatibility with 1.9.3