Fixing client?