Hotfix/alert disabled