Pulled in fix for associations