Fix Issue #1904