Fix issue #343