Fixed Issue #1088 

 Fixed Issue #1088