pulling string case fix from upstream