Fix sorting issue

TNL-952