Client logic fixed