Fixed new api