Fix sorting and it's cointainer