fix the swipe problem
fixed the concurrent problem