unique key bug fixed maybe