Fixed Issue #1924