More thread fixing