fix for new api (2)