Hotfix/security