Fix issue #34