attemp to fix response parsing bug