almost no change, but deserves a commit