Fixes gh-82

Like, for real this time.