Fix issue where @-mentions are mixed up