Fixed #68 (which also wound up fixing #70)