diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c
index 8bc070f..875901c 100644
--- a/obexd/plugins/phonebook-tracker.c
+++ b/obexd/plugins/phonebook-tracker.c
"?_unb_contact nco:hasPhoneNumber ?_cpn . " \
CONSTRAINT \
"OPTIONAL { " \
- "{ SELECT ?_contact ?_cpn ?_role ?_number " \
+ "{ SELECT ?_contact ?_no ?_role ?_number " \
"count(?_contact) as ?cnt " \
"WHERE { " \
"?_contact a nco:PersonContact . " \
"?_contact nco:hasPhoneNumber ?_number" \
"} " \
"?_number maemo:localPhoneNumber ?_no . " \
- "?_cpn maemo:localPhoneNumber ?_no . " \
- "} GROUP BY ?_cpn } " \
+ "} GROUP BY ?_no } " \
"FILTER(?cnt = 1) " \
+ "?_cpn maemo:localPhoneNumber ?_no . " \
"} " \
"} "