Patch for an Issue #553