Fix touch/no touch event generation