Fix uniformity