fixed onTouch handlers