Fixed Issue #943