Fixed Issue #1030

Fixed Issue #1030