Fixes issue #344