Fix frozen string issue