Done fix validation