Hotfix that Closes #1004