fixing habtm associations