had to change how associations were found in join too