[#26] Fixed associations.