Workaround for issues with use-package