Fix repeating string issue. Need to handle string size later