adapted to new API (.58)