Fix issue with click/tap selection