Bug workaround for new version of setuptools