Fixed Issue #867 

 Fixed Issue #867