Added fixed for gestures to work