Fix issue 22.