Patch related to the Issue #696