bug fix for composite-id