Fixed Issue #1106