Fixed Issue #1107