adapt to comodl-load changes