Fixes #15 (for realsies)