Fix issue 20.