Added click protection