Click monitoring fix