[02.07] Fixing of the Hotfix