Ordering changed from potential bug