Fix issue #229