Fixed client crash