breaking and fixing habtm