further work on #19