better agb type matching