Fix 1834
Merge pull request #1847 from aRn0D/fix/1834

Fix 1834