fix composite key issue