fix onclick
merge touchup