Fixes Issue #1867
Merge pull request #1943 from YotaXP/Fixes-1867

Fixes Issue #1867