Workaround hotfix Closes #992