Actually fixes #80