Fix thread expanding