b1350c1 fix override captures issue