diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index 1620b5d2..a525528e 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -75,26 +75,26 @@ fi
 # Otherwise, populate it with every service
 if [[ "$DTF_SERVICES" == "" ]]; then
 	dtf_log "Starting all available services"
-	for service in $DTF_SEVICES_DIR/*.dtf; do
-		export DTF_SERVICES="$DTF_SERVICES $(basename $service)"
+	for service in $DTF_SERVICES_DIR/*.dtf; do
+		export DTF_SERVICES="$DTF_SERVICES $(basename "$service")"
 	done
 else
 	dtf_log "Starting a subset of available services"
 fi
 
 ## Run startup scripts
-for service in $DTF_SERVICES_DIR/*.dtf; do
+for service in $DTF_SERVICES; do
 	service_full="$DTF_SERVICES_DIR/$service"
 	(
-	if ! [ -r $service ]; then
+	if ! [ -r "$service_full" ]; then
 		dtf_log "Service is unreadable or missing: $service"
 		exit 1
 	fi
-	if ! [ -x $service ]; then
+	if ! [ -x "$service_full" ]; then
 		dtf_log "Service is unexecutable: $service"
 		exit 1
 	fi
-	source $service
+	source $service_full
 	if isup && [[ "$service_kill_on_reload" == "true" ]] ; then
 		stop
 	fi