fixes issue #385