validating fixes 2