Fixed escaped character issues