diff --git a/heartbeat/LVM-activate b/heartbeat/LVM-activate
index a8e40dce44..53223367e9 100755
--- a/heartbeat/LVM-activate
+++ b/heartbeat/LVM-activate
@@ -820,17 +820,14 @@ lvm_start() {
         if systemd_is_running ; then
         	# Create drop-in to deactivate VG before stopping
 		# storage services during shutdown/reboot.
-		after=$(systemctl show resource-agents-deps.target.d \
-			--property=After | cut -d'=' -f2)
-
-		case "$after" in
-			*" blk-availability.service "*)
-				;;
-			*)
-				systemd_drop_in "99-LVM-activate" "After" \
+		systemctl show resource-agents-deps.target \
+			--property=After | cut -d'=' -f2 | \
+			grep -qE "(^|\s)blk-availability.service(\s|$)"
+
+		if [ "$?" -ne 0 ]; then
+			systemd_drop_in "99-LVM-activate" "After" \
 					"blk-availability.service"
-				;;
-		esac
+		fi
 
 		# If blk-availability isn't started, the "After="
 		# directive has no effect.