Fix to allow the latest buildout