Actually fixed definition of thresholds