Fixes Issue 1882

Issue #1882