Fixed Issue #1193