Fixes #81 with a little help from #82