Fixed Issue #1233