Fixed request old AND new api