Adapted to a library change