Fixing component linking (DM-61)