Fix infinite push