Fix issue #32