... which also finds the hint if it's not the first one in the array.

Change-Id: I5ff61305bcc896de0269c5bf47b237dce00142c4