This too needs tests.