fixed string issues