better fix for composite primary keys