Fixed Issue #1212
Fixed Issue #1212