fix for new api