Rate limit crash fix