Repair fixed and properties validated