Fix issue #22.