fix compatibility with older base