Fix issue with response parsing