Fix to make sure we clone container before we sort it!