diff --git a/src/main/java/guru/springframework/spring5webfluxrest/controllers/VendorController.java b/src/main/java/guru/springframework/spring5webfluxrest/controllers/VendorController.java
index fb9d1d3..7f3b288 100644
--- a/src/main/java/guru/springframework/spring5webfluxrest/controllers/VendorController.java
+++ b/src/main/java/guru/springframework/spring5webfluxrest/controllers/VendorController.java
@@ -43,17 +43,18 @@ Mono<Vendor> update(@PathVariable String id, @RequestBody Vendor vendor){
         return vendorRepository.save(vendor);
     }
 
-    @PatchMapping("api/v1/vendors/{id}")
-    Mono<Vendor> patch(@PathVariable String id, @RequestBody Vendor vendor){
-
-        Vendor foundVendor = vendorRepository.findById(id).block();
-
-        if(!foundVendor.getFirstName().equals(vendor.getFirstName())){
-            foundVendor.setFirstName(vendor.getFirstName());
-
-            return vendorRepository.save(foundVendor);
-        }
-        return Mono.just(foundVendor);
+    @PatchMapping(path = "/{id}")
+    public Mono<Vendor> patchVendor(@PathVariable String id, @RequestBody Vendor vendor) {
+        return this.vendorRepository.findById(id)
+                .flatMap(vendorFnd -> {
+                    if (vendorFnd.getFirstName() != vendor.getFirstName() && vendor.getFirstName() != null && vendor.getFirstName().length() > 0) {
+                        vendorFnd.setFirstName(vendor.getFirstName());
+                    }
+                    if (vendorFnd.getLastName() != vendor.getLastName() && vendor.getLastName() != null && vendor.getLastName().length() > 0) {
+                        vendorFnd.setLastName(vendor.getLastName());
+                    }
+                    return this.vendorRepository.save(vendorFnd);
+                });
     }
 
 }