Fixed Issue #1122