fix composite keys