Finally fixed that stupid duplicated data issue