Fix sorting issue

TNL-952
is this truly random? Or is it just deliberately out of order?