Fixed client hopefully