fixed up associations