Address server side throttling problem fixes:18