Compatibility with base-4.7.1