Fixed Issue #1592