Attempting to fix mention issues