Fixed string overflow bug