Fixes #17. Finally.