Compatibility with older versions of base