Fixes #32 for real