Hotfix for mention errors