Call resetCurrent as soon as possible to avoid conflict with other thread

Change-Id: Ie3edc252135301ba5b85b80edcdbe75537d0da16