Fixed apiv2 throttling misbehaviour