Fixed Issue #1022

Fixed Issue #1022