Make sure order is correct