touchUp fix
merge
touchUp fix