New API temp fix