Fixed #21 touch screen issues