Fixed Issue #1105 

 Fixed Issue #1105