Fix issue #16.