Fix composite key