fixed bundle issues