Fix crash in V1 of the api