Fix race condition in base page