Fixing a bug with HandleTap not sending the origin event