Fixing throttle issue