Proper patch for an Issue #591