Fixing auto run misbehavior