Multi-threading bug fix