Compatibility with 1.4