Merge pull request #1912 from Ansuel/fixassoci