merge thread
fix a mistake