Had similar problem. Ended up being the Idle control valve