feature 1833 implementation

see https://osl.uoregon.edu/redmine/issues/1833
works for me, maybe needs more testing