fix to prevent data duplication