slight changes missed in previous commit