Actually fixes #25