Mentions fix