Fixed Issue #3193