Fix issue 18.