Fixed Issue #1106 

 Fixed Issue #1106