Works with newer base package.