SSP-2035 - fixed scoping issue with field validator