Fixed Issue #1125 

Fixed Issue #1125