fix group and self mentioning