Fixed Issue #1122

Fixed Issue #1122