First attempt 400 bad request fix