Patch for an Issue #510