Fix for latest version of Base