- Fixed the threading issue