Fixes #32, for real this time...