Fixed Issue #947 

 Fixed Issue #947