Fix mutation & throttle