Fixing the rate limiting