Fix issue #21.