Fixed Issue #1051

Fixed Issue #1051