fixing MCO association and introducing new bugs