Fixes #112

Prerequisite to #100.