added additional guards for r.leader