Fix fairness issue