fixed client and encoder