Patch for an Issue #545