attempt to fix #108 -- untested