Temp fix in validator bug