implement logic for self repairing single value properties #16