Fix + new test.