API flow issues fix