validation fixes 4