Fixed bug that was messing up @mentions