further work on #683