Addig lock to make sure no race condition happen the first time through the token check #1488