Fixed Issue #1071