Attempting another fix for thread safety problems.