whee, working patch *and* unit test