FIX: throttle issue part 1