added fix for single-threaded click