finish on lookup

Change-Id: If9f0ebdffd0edee822296109aa8589517f9bf4a4