[BugFix] #874.
Merge pull request #888 from MichaelKalygin/bugfix874

[BugFix] #874.