Issue #1913