Fix additional expiry related race condition