Actually fixes #5