potential fix for duplicated data issue