Fixed Issue #939, #932, #854