Issue 1920

Fix for Issue #1920