Better throttle handling