Fix issue 17.