fixing the associations