Fix issue 16.