Booja: Finally fixed the gesture issue