Fixed Issue #1121