Hotfix for issue #1006