Fixed client copy