Fixes #2, for real this time!