Fixes #1, for real this time