corrected composite-id handling