Fixing issue with response format