Compatibility with 1.6.4