FIX: throttle issue part 2