Fix new api