Fixed Issue #1032

Fixed Issue #1032