fix validation a bit