Fixed Issue #943 

 Fixed Issue #943