fixed models with has_many & belongs_to