Optimize the code. Don't create a new string :|

Change-Id: Id6d58fd08bcaa3d7d569b65c48f9db3430eb8870