Fix shadow arg checking