untested fix to #17