bugfix and optimize for 1 touch gesture