Fixed the way that Set determine the already sent arguments
Fixed the way that UnSort determine the already sent arguments
Reapplied the changes after the rebase