Hotfix from upstream repo