further work on #41, related to Corpus