Fixed Issue #1234