Be more careful about breaking up strings