Patch related to the Issue #661