Task 11834 - Zuker crash bugfix
Merge pull request #8 from Feodorov/task/11834

Task 11834 - Zuker crash bugfix