Fixes #13 (again).