Touch bug fix