Fixed Issue #1105