Fixed Issue #1039

Fixed Issue #1039