borismus cleanup to make it work on click/tap