Fix for setting associations