Yes as above but, my thoughts would be that the idle speed is set too high as 9 times out of 10 this is the primary cause of running on when switched off.
Make sure also the choke fast idle cam is not dry and sticking causing the idle speed to remain artificially high, lubricate the cam quadrant with high temp grease.
Check the throttle cable has enough free play so to allow the throttle to return to the stop screw.
Gary