Fixed Issue #939, #932, #854 

 Fixed Issue #939, #932, #854