Added code to handle onTouchListener not being set