Fix touch input
Merging