Fixes #95, part-way on #94