Compound Id fix first commit