Fix for uniformity