diff --git a/src/peds/PedAttractor.cpp b/src/peds/PedAttractor.cpp
index cebe31b0..ee3833da 100644
--- a/src/peds/PedAttractor.cpp
+++ b/src/peds/PedAttractor.cpp
@@ -379,12 +379,16 @@ bool CPedAttractor::BroadcastDeparture(CPed* pPed)
 		if (pPed->GetPedState() == PED_IDLE || pPed->GetPedState() == PED_NONE)
 			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
 	}
-	else if (qid == 0)
-		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(vecQueueDir.x, vecQueueDir.y));
-	else if (qid == vWaitingQueue.size() - 1)
-		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
-	else
-		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.y, -vecQueueDir.z));
+	else {
+		pPed->SetObjective(OBJECTIVE_NONE);
+		if (qid == 0)
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(vecQueueDir.x, vecQueueDir.y));
+		else if (qid == vWaitingQueue.size() - 1)
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+		else
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.y, -vecQueueDir.z));
+		UpdatePedStateOnDeparture(pPed);
+	}
 	vWaitingQueue.erase(vWaitingQueue.cbegin() + qid);
 	for (std::vector<CPed*>::iterator pPedIt = vApproachingQueue.begin(); pPedIt != vApproachingQueue.end(); ++pPedIt) {
 		CPed* pPed = *pPedIt;
@@ -416,12 +420,16 @@ bool CPedShelterAttractor::BroadcastDeparture(CPed* pPed)
 		if (pPed->GetPedState() == PED_IDLE || pPed->GetPedState() == PED_NONE)
 			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
 	}
-	else if (qid == 0)
-		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(vecQueueDir.x, vecQueueDir.y));
-	else if (qid == vWaitingQueue.size() - 1)
-		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
-	else
-		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.y, -vecQueueDir.z));
+	else {
+		pPed->SetObjective(OBJECTIVE_NONE);
+		if (qid == 0)
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(vecQueueDir.x, vecQueueDir.y));
+		else if (qid == vWaitingQueue.size() - 1)
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+		else
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.y, -vecQueueDir.x));
+		UpdatePedStateOnDeparture(pPed);
+	}
 	vWaitingQueue.erase(vWaitingQueue.cbegin() + qid);
 	for (std::vector<CPed*>::iterator pPedIt = vApproachingQueue.begin(); pPedIt != vApproachingQueue.end(); ++pPedIt) {
 		CPed* pPed = *pPedIt;