touch-related bug fix