Merge "Fix wrong thread issue"