More thread issue fixing, still not working

UCC git Repository :: git.ucc.asn.au