fixed String duplication issues