Fix thread comments for real this time