Fixing client according to new server