String issue fix