correction errors in generic targets after operators support
Merge pull request #639 from ifilippov/master

correction errors in generic targets after operators support