adaption to new lib format