More on #17