Added correct tap handler... (+ fix in function scope)