Fix string handling