fix string handling