Merge pull request #355 from iskiselev/master

Fix LINQ method implementation for #353. It is not full #353 fix.
Dirty hack to workaround #359