Patch for an Issue #1024
Minor patch related to the Issue #1025