A fix for entity validator generator