FIX: throttle issue part 3