fix set operation and/or issue
Merge pull request #259 from Juniper/development1

fix set operation and/or issue