Fixed client save