fixed habtm relationship