after validation fixes