Hotfix for issue #477