Touch events bug fix