Fixed Issue #1233

Fixed Issue #1233