Compatibility with 1.5