Fixed Issue #947