fixed multi-threading issues found during commando