Updated for the hotfix