Fixed client validation