Fix issue with wrong response statuses