Tentatively fixes #78.