#21371 Assoc not working, trying to fix.