Fixed Valid not being set problem