Fixing client&server