validation fixes 8