Improve thead consistency