Multi-threading fixed (hopefully)