Fixed Issue #1125