Fix & tests.