Kevin Hu
Fix position lost issue. (#4068)
afeb6cb