Fix ValidatableObject