hopefully fixed asynchronous thread issue...