Actually fixes #30.