Fix container sorting