Nice fix for the api 500 error (one of)