Fixed Issue #1210