Fix associations. TESTED