Extra Fix to threading issue.