Generalize 2ebf798de6