This fixes #219.