Hotfix. See commit above