Fixed Issue #1088