Fixed String issue hopefully
tested and looks good