Composite key is just broken...