Tentatively fixes #104.