Implement @marc's fix: fixing @mentions