Fixed Issue #1028

Fixed Issue #1028