further work on #2045