Fixes #13 better.