Fixed Issue #1079