fix to intertwining of click handlers in versions