Fix assocation