Attempt to fix mentions