Fixed @mention Issue

*insert a penguin having a rave here*