Fixes #129, again. Now with unit test.