Additional change related to issue 6573