- Fix the associate/disassociate