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