fix issuse