Use reverse lookups to finally close issue #3