Fix issue #32.