fixed issuse