Another attempt at correcting the API traffic