Fixed Issue #1744