Fixed Issue #1235