Handle click 2.0- backwards compatibility properly