Hotfix #666