Needs a unit test, no?