Fix incorrect lookup

Also fix typo in comment. Follow-up to broken Change-Id:
Iadc35ee48d6071408147245d898014fb79d4cbe5

Change-Id: I7b5f1c550ff3a91220572dd46c3553f817d95dd3