added tap-finished instead of indexOf hack