Possible hotfix for mention worker