Address issue with repeated string