Possible fix for intermittent multi-threading error