added hot fix for mention issue.