Fixed Issue #842