fixed uniqueness issue