Fixed Issue #1043

 Fixed Issue #1043