diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
index 789d463ee..d9adfeb6b 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
@@ -174,14 +174,13 @@ public class Owner extends Person {
 
 	public void updatePet(Pet newPet)
 	{
-		for(int i=0 ; i<pets.size() ; i++)
+		Pet existingPet = getPet(newPet.getId());
+
+		if(existingPet != null)
 		{
-			Pet existingPet = pets.get(i);
-			if(existingPet.getId().equals(newPet.getId()))
-			{
-				pets.set(i,newPet);
-				break;
-			}
+			existingPet.setName(newPet.getName());
+			existingPet.setBirthDate(newPet.getBirthDate());
+			existingPet.setType(newPet.getType());
 		}
 	}
 
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
index 64de1349d..26ebc754a 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
@@ -145,7 +145,7 @@ class PetController {
 		if (result.hasErrors()) {
 			return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
 		}
-		
+
 		owner.updatePet(pet);
 
 		this.owners.save(owner);