Fix parallel requests race condition