Updated as per suggested by mpdehaan for pull #6889