Fixes Issue #1867

Fixes Issue #1867