Fix for new api