Json response fix