Fixes #3 for real