Fix regression from #74
Fixes #82