Fix the association