validation fixes 6