fix main issuse