Fix for generic-1
Merge pull request #1 from dbabokin/Vsevolod-Livinskij-master

Fix for generic-1