fix for tap gesture returning wrong item