Fix string issue