Fix ModifiedControlVariable violation