Fixed Issue #868 

 Fixed Issue #868