Tiny change to allow full name matching too