Fixed Issue #1202