Added correct tap handler... (+ yet another fix, this time to prevent click (2))