fixed thread issue
fixed thread issue