Fixes issue #343