Second patch related to the Issue #846