Fix it once and for all. Add unit test.