attempt #2 to fix the duplicated database population