proposed solution to #895, needs review by @davidfestal