Actually fixes #2