Correct string handling