Fixed Issue #842 

 Fixed Issue #842