validation fixes 7