More thread fix