Avoid 400 Bad Request