adapt to comodl changes