Fixing assignments

Fixing the assignment logic:

• Match all the occurrences
• Removing original assignments subtrees