HOTFIX #79