Fixed bug with mentions