Fix for trunk after rev 223802
New approach to fix
Merge pull request #923 from Vsevolod-Livinskij/fix_223802

Fix for trunk after rev 223802