latest fix for validation