Actually fixes #90.