Fix issue #351