diff --git a/tools/vgextend.c b/tools/vgextend.c
index 37f4dba96..20c05c3d7 100644
--- a/tools/vgextend.c
+++ b/tools/vgextend.c
@@ -43,21 +43,15 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
 		return ECMD_FAILED;
 	}
 
-/********** FIXME
-	log_print("maximum logical volume size is %s",
-		  (dummy = lvm_show_size(LVM_LV_SIZE_MAX(vg) / 2, LONG)));
-	dm_free(dummy);
-	dummy = NULL;
-**********/
+	if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
+		log_error("Can't get lock for orphan PVs");
+		unlock_and_release_vg(cmd, vg, vg_name);
+		return ECMD_FAILED;
+	}
 
 	if (!archive(vg))
 		goto error;
 
-	if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
-		log_error("Can't get lock for orphan PVs");
-		return ECMD_FAILED;
-	}
-
 	/* extend vg */
 	if (!vg_extend(vg, argc, argv))
 		goto error;