oops; previous commit screwed up #9, now doing it properly