add fix for new api